feat: ngql websocket #403
Merged
feat: ngql websocket #403
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hetao92
reviewed
Dec 20, 2022
kqzh
reviewed
Dec 27, 2022
Comment on lines
+83
to
+85
| if err == nil { | ||
| clientInfo, _ = auth.Decode(tokenCookie.Value, svcCtx.Config.Auth.AccessSecret) | ||
| } |
There was a problem hiding this comment.
if err != nil, need handle err? and why ingore auth.Decode err
There was a problem hiding this comment.
should make sure websocket connecting succeed
kqzh
reviewed
Dec 27, 2022
server/api/studio/pkg/ws/client.go
Outdated
Comment on lines
71
to
74
| msgPost := MessagePost{} | ||
| msgPost.Header.MsgId = msgReceived.Header.MsgId | ||
| msgPost.Header.SendTime = time.Now().UnixMilli() | ||
| msgPost.Body.MsgType = msgReceived.Body.MsgType |
There was a problem hiding this comment.
merge into one declaration? like
msgPost := MessagePost{
...
}
server/api/studio/pkg/ws/client.go
Outdated
Comment on lines
83
to
89
| reqParamList := msgReceived.Body.Content["paramList"] | ||
| if reqParamList != nil && reflect.TypeOf(reqParamList).Kind() == reflect.Slice { | ||
| s := reqParamList.([]interface{}) | ||
| for i := 0; i < len(s); i++ { | ||
| paramList = append(paramList, s[i].(string)) | ||
| } | ||
| } |
There was a problem hiding this comment.
use
reqParamList, ok := msgReceived.Body.Content["paramList"].([]interface{})
if ok {
paramList = append(paramList, reqParamList[i].(string)...)
}instead ?
server/api/studio/pkg/ws/client.go
Outdated
Comment on lines
76
to
81
| gql, paramList := "", []string{} | ||
|
|
||
| reqGql := msgReceived.Body.Content["gql"] | ||
| if reqGql != nil { | ||
| gql, _ = reqGql.(string) | ||
| } |
There was a problem hiding this comment.
use
reqGql, ok := msgReceived.Body.Content["gql"].(string)
if ok {
gql = reqGql
}instead ?
server/api/studio/pkg/ws/client.go
Outdated
| } | ||
|
|
||
| execute, _, err := dao.Execute(c.clientInfo.NSID, gql, paramList) | ||
|
|
| if auth.IsSessionError(err) { | ||
| content["code"] = ecode.ErrSession.GetCode() | ||
| } | ||
| msgPost.Body.Content = &content |
server/api/studio/pkg/ws/client.go
Outdated
Comment on lines
115
to
118
| msgPost := MessagePost{} | ||
| msgPost.Header.MsgId = msgReceived.Header.MsgId | ||
| msgPost.Header.SendTime = time.Now().UnixMilli() | ||
| msgPost.Body.MsgType = msgReceived.Body.MsgType |
Comment on lines
+168
to
+172
| msgPost.Body.Content = map[string]any{ | ||
| "code": base.Success, | ||
| "data": resContentData, | ||
| "message": "Success", | ||
| } |
There was a problem hiding this comment.
execute batch ngql will never failed?
There was a problem hiding this comment.
yeah, single ngql execution may be error res, batch req should never fail unless network anomaly or other unexpected server error
server/api/studio/pkg/ws/hub.go
Outdated
Comment on lines
38
to
47
| case message := <-h.broadcast: | ||
| for client := range h.clients { | ||
| select { | ||
| case client.send <- message: | ||
| default: | ||
| close(client.send) | ||
| delete(h.clients, client) | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
has been commented out, may be used in future
veezhang
reviewed
Jan 3, 2023
server/api/studio/pkg/ws/client.go
Outdated
|
|
||
| reqGql := msgReceived.Body.Content["gql"] | ||
| if reqGql != nil { | ||
| gql, _ = reqGql.(string) |
There was a problem hiding this comment.
I think that it's should not to be ignored. How about you ?
There was a problem hiding this comment.
msgReceived.Body.Content["gql"] may be a nil value in some case, only paramList is passed in request data
veezhang
reviewed
Jan 3, 2023
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/gorilla/websocket" |
veezhang
reviewed
Jan 3, 2023
server/api/studio/pkg/ws/client.go
Outdated
| pingPeriod = (pongWait * 9) / 10 | ||
|
|
||
| // Maximum message size allowed from peer. | ||
| maxMessageSize = 16 * 1024 |
veezhang
reviewed
Jan 3, 2023
server/api/studio/pkg/ws/client.go
Outdated
| if reqParamList != nil && reflect.TypeOf(reqParamList).Kind() == reflect.Slice { | ||
| s := reqParamList.([]interface{}) | ||
| for i := 0; i < len(s); i++ { | ||
| paramList = append(paramList, s[i].(string)) |
veezhang
reviewed
Jan 3, 2023
| } | ||
| } | ||
|
|
||
| msgSend, _ := json.Marshal(msgPost) |
veezhang
reviewed
Jan 3, 2023
server/api/studio/pkg/ws/client.go
Outdated
Comment on lines
123
to
129
| reqGqls := msgReceived.Body.Content["gqls"] | ||
| if reqGqls != nil && reflect.TypeOf(reqGqls).Kind() == reflect.Slice { | ||
| s := reqGqls.([]interface{}) | ||
| for i := 0; i < len(s); i++ { | ||
| gqls = append(gqls, s[i].(string)) | ||
| } | ||
| } |
There was a problem hiding this comment.
Maybe add some functions for MessageReceiveBody is more clearer?
And check the type in those functions.
func (b *MessageReceiveBody) GetGqls() (string, error) {
}
func (b *MessageReceiveBody) GetParamList() ([]string, error) {
}
// and so on
veezhang
reviewed
Jan 3, 2023
server/api/studio/pkg/ws/client.go
Outdated
| break | ||
| } | ||
|
|
||
| msgReceivedStr := bytes.TrimSpace(bytes.Replace(message, newline, space, -1)) |
There was a problem hiding this comment.
Why need bytes.Replace(message, newline, space, -1)?
veezhang
reviewed
Jan 3, 2023
| } | ||
| w.Write(message) | ||
|
|
||
| // Add queued chat messages to the current websocket message. |
veezhang
reviewed
Jan 3, 2023
| // Add queued chat messages to the current websocket message. | ||
| n := len(c.send) | ||
| for i := 0; i < n; i++ { | ||
| w.Write(newline) |
There was a problem hiding this comment.
Why need to write newline ?
veezhang
reviewed
Jan 3, 2023
| } | ||
| } | ||
|
|
||
| // ServeWs handles websocket requests from the peer. |
There was a problem hiding this comment.
ServeWs => ServeWebSocket?
veezhang
reviewed
Jan 3, 2023
server/api/studio/pkg/ws/hub.go
Outdated
| clients map[*Client]bool | ||
|
|
||
| // Inbound messages from the clients. | ||
| broadcast chan []byte |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
What problem(s) does this PR solve?
Issue(s) number:
Description:
How do you solve it?
Special notes for your reviewer, ex. impact of this fix, design document, etc: